Remove some workarounds for +/= and shift key handling.

Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds
        for +/= and shift key handling.

diff --git a/ChangeLog b/ChangeLog
index 856a5c5553e812c803eb0a13a7270f3e2d609d95..edeab2696911fd7e95936d7011fb0bca9f5b6f7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds
+       for +/= and shift key handling.
+
 Wed Feb 20 14:26:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkkeyhash.[ch]: Implement "fuzzy" key binding lookups;

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 856a5c5553e812c803eb0a13a7270f3e2d609d95..edeab2696911fd7e95936d7011fb0bca9f5b6f7d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds
+       for +/= and shift key handling.
+
 Wed Feb 20 14:26:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkkeyhash.[ch]: Implement "fuzzy" key binding lookups;

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 856a5c5553e812c803eb0a13a7270f3e2d609d95..edeab2696911fd7e95936d7011fb0bca9f5b6f7d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds
+       for +/= and shift key handling.
+
 Wed Feb 20 14:26:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkkeyhash.[ch]: Implement "fuzzy" key binding lookups;

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 856a5c5553e812c803eb0a13a7270f3e2d609d95..edeab2696911fd7e95936d7011fb0bca9f5b6f7d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds
+       for +/= and shift key handling.
+
 Wed Feb 20 14:26:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkkeyhash.[ch]: Implement "fuzzy" key binding lookups;

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 856a5c5553e812c803eb0a13a7270f3e2d609d95..edeab2696911fd7e95936d7011fb0bca9f5b6f7d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds
+       for +/= and shift key handling.
+
 Wed Feb 20 14:26:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkkeyhash.[ch]: Implement "fuzzy" key binding lookups;

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 856a5c5553e812c803eb0a13a7270f3e2d609d95..edeab2696911fd7e95936d7011fb0bca9f5b6f7d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds
+       for +/= and shift key handling.
+
 Wed Feb 20 14:26:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkkeyhash.[ch]: Implement "fuzzy" key binding lookups;

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 856a5c5553e812c803eb0a13a7270f3e2d609d95..edeab2696911fd7e95936d7011fb0bca9f5b6f7d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds
+       for +/= and shift key handling.
+
 Wed Feb 20 14:26:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkkeyhash.[ch]: Implement "fuzzy" key binding lookups;

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index f195f6a4999b84d77a2fa22b29a43b05afa8b3bc..e38a8f7109f009406a44125ac2d9f223a84f450d 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -482,35 +482,19 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                    GTK_TYPE_NONE, 1, GTK_TYPE_CTREE_EXPANSION_TYPE);
 
   binding_set = gtk_binding_set_by_class (klass);
-  gtk_binding_entry_add_signal (binding_set,
-                               GDK_plus, GDK_SHIFT_MASK,
-                               "change_focus_row_expansion", 1,
-                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_plus, 0,
                                "change_focus_row_expansion", 1,
                                GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
-  gtk_binding_entry_add_signal (binding_set,
-                               GDK_plus, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
-                               "change_focus_row_expansion", 1,
-                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_plus, GDK_CONTROL_MASK,
                                "change_focus_row_expansion", 1,
                                GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
 
-  gtk_binding_entry_add_signal (binding_set,
-                               GDK_KP_Add, GDK_SHIFT_MASK,
-                               "change_focus_row_expansion", 1,
-                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_KP_Add, 0,
                                "change_focus_row_expansion", 1,
                                GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
-  gtk_binding_entry_add_signal (binding_set,
-                               GDK_KP_Add, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
-                               "change_focus_row_expansion", 1,
-                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_KP_Add, GDK_CONTROL_MASK,
                                "change_focus_row_expansion", 1,
@@ -542,14 +526,6 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                                GDK_KP_Equal, 0,
                                "change_focus_row_expansion", 1,
                                GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
-  gtk_binding_entry_add_signal (binding_set,
-                               GDK_equal, GDK_SHIFT_MASK,
-                               "change_focus_row_expansion", 1,
-                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
-  gtk_binding_entry_add_signal (binding_set,
-                                GDK_KP_Equal, GDK_SHIFT_MASK,
-                               "change_focus_row_expansion", 1,
-                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_KP_Multiply, 0,
                                "change_focus_row_expansion", 1,